From: Bernd Zeimetz <bernd@bzed.de>
Date: Sun, 25 Oct 2015 19:36:38 +0000 (+0100)
Subject: Refreshing patches.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~142
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=901aac07be13ffec81fda3b88bad5eefe8440a85;p=gpsbabel.git

Refreshing patches.
---

diff --git a/debian/patches/gpsbabelfe_do-not-check-for-newer-version b/debian/patches/gpsbabelfe_do-not-check-for-newer-version
index 1493dd56f..dd7db2a63 100644
--- a/debian/patches/gpsbabelfe_do-not-check-for-newer-version
+++ b/debian/patches/gpsbabelfe_do-not-check-for-newer-version
@@ -47,7 +47,7 @@ Disable check for newer versions on start.
      ignoreVersionMismatch_(true),
 --- a/gpsbabel/gui/mainwinui.ui
 +++ b/gpsbabel/gui/mainwinui.ui
-@@ -651,7 +651,6 @@
+@@ -637,7 +637,6 @@
      <addaction name="actionHelp"/>
      <addaction name="separator"/>
      <addaction name="actionAbout"/>
@@ -55,7 +55,7 @@ Disable check for newer versions on start.
      <addaction name="separator"/>
      <addaction name="actionVisit_Website"/>
      <addaction name="actionMake_a_Donation"/>
-@@ -680,11 +679,6 @@
+@@ -666,11 +665,6 @@
      <string>Preferences...</string>
     </property>
    </action>
@@ -69,7 +69,7 @@ Disable check for newer versions on start.
      <string>Visit Website...</string>
 --- a/gpsbabel/gui/mainwindow.cc
 +++ b/gpsbabel/gui/mainwindow.cc
-@@ -172,7 +172,6 @@ MainWindow::MainWindow(QWidget* parent):
+@@ -147,7 +147,6 @@ MainWindow::MainWindow(QWidget* parent):
    connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
    connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));
    connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX()));
@@ -77,7 +77,7 @@ Disable check for newer versions on start.
    connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX()));
  
    connect(ui_.inputFormatCombo,  SIGNAL(currentIndexChanged(int)),
-@@ -231,19 +230,7 @@ MainWindow::MainWindow(QWidget* parent):
+@@ -206,19 +205,7 @@ MainWindow::MainWindow(QWidget* parent):
  
    //--- Restore from registry
    restoreSettings();
@@ -97,7 +97,7 @@ Disable check for newer versions on start.
  }
  
  //------------------------------------------------------------------------
-@@ -1074,10 +1061,6 @@ void MainWindow::applyActionX()
+@@ -1021,10 +1008,6 @@ void MainWindow::applyActionX()
  //------------------------------------------------------------------------
  void MainWindow::closeActionX()
  {